Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <[email protected]>
Mon, 6 Apr 2015 10:57:15 +0000 (06:57 -0400)
committerTom Rini <[email protected]>
Mon, 6 Apr 2015 10:57:15 +0000 (06:57 -0400)

Trivial merge